Merge tag 'upstream/2017.4' into debian/master
authorSimon McVittie <smcv@debian.org>
Mon, 17 Apr 2017 14:25:39 +0000 (15:25 +0100)
committerSimon McVittie <smcv@debian.org>
Mon, 17 Apr 2017 14:25:39 +0000 (15:25 +0100)
Upstream version 2017.4


Trivial merge